Better build script and more files