Restructured solution and source. Began using Catel.