re-organized files, new build script