Rename package, correct directory structure