changing folder structure
Imported into VS Express