Some cosmetic changes to the structure of the project