Modularized the site for easier development