Renaming and moving some packages around