renamed files
some fixes