organised source files and updated build script