initial refactor
move views etc to cms module
more refactor