restructured file layout and renamed paths
Merging from Dhruv