Major package reorganization and some renamings