Restore modules/scripts location & cleanup poms