moved and renamed some files, cleaning