Issue #2: Ordered source and header files a bit