LPS-35647 Reorganize portlets

I left weights 1.0 and 2.0 within "Apps" for the marketplace portlets when deployed. The rest of the portlets may need to be repositioned as they are improved and merged together.