Moved modules out of chapter dir