moving static functions into separate modules
removing useless files