Minor update (0.7.4)

Moved core into modules
Minor layout fixes