Consolidated into one file [wip]
Merge pull request #54 from Versal/cleanup-and-single-file

Consolidated into one file [wip]