- refactored dir structure to default maven layout