Better build script and file structure