Improvements to build, now a source files in top level