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

Fresh pull request for 
Issue #11: Move modules and themes out of sites directory

Let me know if need anything else on this to complete.