Merge "Reorganize directories and switch libaries to using asn1c"