Rearranged package dir, added back EditProfile and Register layout.