Moved to a slightly better directory structure.