restructuring code files