Church-/TinyAssembler 1 merged

• Restructure Aug 18