Refactored parts of projects. Re-named a few classes to fit OO style