Cleanup: reorganizing source files