Cleaned project and got it to a working stage.