Restructure the project to look cleaner.