Modularise.
Remove content in modules and clean up a bit.