minor refactoring
some refactoring and deleting of empty files