Changed structed of project a bit.