Refactor solution and folder organization to accomodate multiple Model and Data alayer assemblies