Refactorings

* Separate content generation to makeContent
* Make ProjectHandler non-static so that it can be replaced by another implementation

Change-Id: I9be6534e1234627c1b5a75e4f8968ba83ee76029
Merge "Refactorings"