Cleaned up code, but named correctly

updated main file names and removed the separate file versions.