Reactored some files