[PULL REQUEST] Restructuring Project Tree