Reorganize
Merge pull request #1 from PreetamJinka/reorganize

Reorganize