Refactor Apps component declarations
Refactor Apps component declarations

assemblymade/meta,lachlanjc/meta,lachlanjc/meta,assemblymade/meta,lachlanjc/meta,assemblymade/meta,lachlanjc/meta,assemblymade/meta