Fixing up the directory structure to follow normal convention for the language.
Again this is to help with the build of the library