merge mikerodrigues/restruct, some renaming