Removing unnecessary comments and renaming some classes to fit standards
Renaming and moving classes
Fixes for 3.0.0 standards