Moved bunch of remaining non-modularized procs into modules