improve packages structure