renamed some files
more code cleaning