Start 12-factor compliance refactor