refactored to maven directory structure
refactored to maven directory structure
improved test