Modules with appropriate directory structure
Merge branch 'master' of https://github.com/iips-dc/dc_website