Removing contrib modules not used,and adding those in this project