Full refactoring and more
Removed environment specific it.properties