Modified directory structure. Hid some files under /lib.
Merge