Organization/Layout

Minor changes