transitory commit
merge attempt
Did some renaming and housekeeping