main source files, after cleanup