changed file names, small header rrefactor