Restructured and fixed app assembler