moved sources up the hierarchy
moved VSstuff up the hierarchy