refactoring dir structure
tweaking poms
blueprint cleanup