Reorganize code files