fixed class file ignoring
small modifications,started refactoring