Update application structure. Fix cms media status issues etc