Minor changes, moved some files