Project refactoring. Project is now ready to use geb