fixed directory structure so that it really does conform to maven
default structure