Restructured some files