Reorganize project, add more components