ISSUE 7

Refactoring source packages as per maven standard packaging.