Renamed some files and fixed bug in build.