changed package name to a more traditional structure