Compacted all of the source code back into a simpler layout