Issue #11: Move modules and themes out of sites directory - update 2