Moved export and sub-module using statements