Start work on next version; files are in disarray