Refactoring the structure of the project for Vertigo 0.7