last finish

changed some file names and commented a bit