renamed a lot of directories to (directoryname)1 to clear up git problems