changed package names

re-structured package names for publishing