Merge restructure back into master