[MOD] Some changes in the pom for easy installing
[MOD] Some restructuring aswell