Moved files to where they are supposed to be (after merging 'Master')