any issues or pull requests opened after this one are going to need to adapt to the new layout. for any issues or pull requests already open: i will either merge or adapt them myself.