Moving classes to correct package, removing unused/old files.