Flattened out package structure and added upload support