Organization: fix migrations, fix fixures, fix entity, add layout

 tested and search with phpcs