Clean up the layouts and separate paths sections cleanly

See ya when r6 hits Google Play ;)
Merge pull request #285 from LoungeKatt/master

Clean up the layouts and separate paths sections cleanly