Cleanup
Clean Up
Merge pull request #2 from theHellyar/Restructured

Restructured