Changed and moved some files