Removed submodule
Added middleclass.