Changed directory structure to make package name more obvious