Small Refactor with module names