Cleanup according to bt5 module creation guildelines(Module and Document Portal Types)