Revert "changed the directory structure for libraries"

This reverts commit 7490029866c2e4676c0be21670e51d9f89bbaea8.