changed directory structure to src/*/java