Reorganize and simplify project.