reverting some changes to structure