Awesome design update
Better file names and code
Merge pull request #2 from edspawn/dev

Awesome design update