Starting to restructure files following EAK conventions