Moving source directories around to match maven structure