Modules

remove object-orientation from modules