Committing the refactored site-portal