Moving sqorm into sub-module