Several changes in order to complete implementation.
Mavenize and more changes in order to get a full and real implementation.