Reorganized structure to prepare for import into VS IDE solution