Moving time up to the top so we can see it
Merge branch 'file-structure-refactoring' of github.com:drenfr01/FaceOff into file-structure-refactoring