Moved modules, and fixed name truncation bug.