Refactor

Removed almost all warnings from project and updated some classes and files.