renamed some packages and moved files to new packages