mattdrayer/master: Aligned solution skeleton with Open edX conventions