some renaming and moving