Re-structured file layout
Revert e66b98c..5964b99

This rolls back to commit e66b98c7753b102ebb637cd12ecb291a7adb36bf.
Merge remote-tracking branch 'upstream/master'