Moving Application class away from core