Housekeeping
Merge branch 'chores/restructure_and_housekeeping'