Refactoring structure of the project, to make it easier to use