pkg name changes, moved files around