rearrange package structure and maven module setup; 
NOTE THIS SHOULD BE REVERTED, IF CHANGES ARE NOT WANTED. IT MARKS A BIG
CHANGE.