mavenized

actually applied all changes that happened in test branch