Fixed a few strange order bugs that happened in the restructuring.
Merge pull request #23 from funnylookinhat/develop

Fixed a few strange order bugs that happened in the restructuring.
Merge pull request #24 from funnylookinhat/master

Fixed a few strange order bugs that happened in the restructuring.