Package refactoring and small updates regarding marketplace and app.js