Restructure the project (copy/paste some code in files :3)