move callouts to module
refactor content module, adjust lists