Finished separation of modules and added forgotten sausage.