restructured some files