Moved mains to there own source files
Moved executables back in with main source files