Though I have learned about how to keep bitcoin for safety but I am not sure I have done it right
If you are not sure about your coins are safe or not, then create a safe cold storage and transfer your coins there, because your current storage could be compromized and let's just not risk that. Better to do some extra work to make it secure than to find out the hard way isnt it...?