removed unnecessary module and dependencies
renamed