Re-structure source files in a (more) sane way