Relocated files
Refactored the build system