Redesigned the project structure.