Merging restructure into master

Repository makeover. Should be good!