restuctured some files