move things around, change package names