Merge pull request #1 from xsleonard/master

restructure
changes
stuff
fix merge