massive refactoring of project structure, classes are in there proper
place now, gonna refactor the methods next