Move modules to separate directory