restructuring
restructuring Go files