Re-orgainizing the location of the source code.
Also fixing a compile-time error that got overlooked.