Refactor project

Change-Id: Ib80ea6b6b69a5b80cfbdd45b097adcc13aefe771