Re-arranging

Re arranged EVERYTHING :D