Rearranged and added files