Initial check in after project re-factor.