Moved stuff around xox
Personal info cleanup