everything: Better organization of file in the project.