project architecture change to support multiple solutions