Cleanup: reorganized source files