Restructure the project