moving around code so the directory structure adheres more to maven conventions