Merged modules, small performance editing, added insertion sort