Change folder structure to be more logical with projects