Some Cleanup and File movement
Clean Up and Bug Fixing