rearranged files, almost there
Uploading all my major/minor changes.
safety first
Merge remote-tracking branch 'upstream/master'