Refactor app code out of html
Micro-fix pack
Sample simplifiers + massive refactor