Reorganize project structure and finish control