Upgraded Site Structure

in order to support user profiles in the future.