More file renaming and org. Working version.