Removed legacy code, moved packages.