some renaming and moving around of files.