Removed files which were previously moved.  Removed lots of checkstyle issues