Some moving and renaming and fixed whitespace issue