restructured initial commit