Switched to Maven's Standard Directory Layout