Update old modules to new structure
Fix dependency definition - needs more later anyway