Various cleanup, edited models
Initial proposal
Worked on plaintext module
Merge branch 'modules' into ui