Fixed the package directory structure