Code refactor

Refactor code to maven structure