Restructure the project folder