Changed some classes to fit proper project structure