Moving module support to application