Redo project structure.