Refactoring code
Refactoring code to have 2 maven modules
From classic API to simplified API
From classic API to simplified API