Added control before deleting .h and .cpp
Improved a lot..