Added module prefix, cleaned routes