fixed last bobeira
moved 2 files