Merge branch 'arrange' into 'master'

Rearrange code dealing with layout files

See merge request Librem5/squeekboard!449

src/tests.rs

@@ -1,6 +1,6 @@
 /*! Testing functionality */
 
-use ::data::Layout;
+use ::data::parsing::Layout;
 use ::logging;
 use xkbcommon::xkb;