Reorganize file layout

Reorganize file layout to have projects reside at same level.