Development merge into master

If this messes up the new file organization then undo this merge!