Fix: moved module to proper place