New file hierarchy and new build system