Revert "Reverting back to old file structure"

This reverts commit 320409e30c1a20c041883ec85a94e2f5c56f0fb1.