General cleanup of unused files, move stuff under the stage_assets namespace for consistency