Switched to maven-shade-plugin
Code cleaning