finished adding the rest of the .rs mods so clean up the code

finished adding the rest of the .rs mods so clean up the code #190