More renaming and folder structure.