Mavenize and libraries updated (uncomming features and refactors)