renamed stuff
removed redundant file