Refactor to support multiple areas, add Public area