changed the package heirarchy