Seperate files and added build script