More refactoring

Removed classes from the main "executables"