some refactoring of code base - mainly renaming methods, splitting big files into multiple smaller files