Cleaned some junk, moved some things.