More cleanup and added executable data
Added executables and used source file names