added Kamil's commits, rearranged files, minor fixes