Refactored structure of site to simplify everything.