[MICHAL] - renaming files & cleaning