Merge event into master

Going to do some directory restructuring, want to pull together branches then re-branch after restructuring is complete.