reverted infra-structure of appier (simpler approach)
simplified structure (again)