Moved directories.
Made version name a macro and created subdirectories in olaf/.