Moving folders around for a more DRY setup