File Tree and Go structure Refactor