Better organization of project