Clean up the layouts and separate paths sections cleanly

See ya when r6 hits Google Play ;)