restructure code, rename modules to be more consistent, factor out some directives from views