restructured to be closer to fabpot/silex-skeleton