Move of modules into a separate directory