Refactor to created all resources under one package