Added removal of modules
Added support for prefixes of more than 1 char