Move modules to a sub directory and add todo.