Re-organize existing source files