Cleanups. Packages names updated according current layout