Readme updated
Further rearrangement of files