Moved modules to package dir.