Adjust to new resource management in Flow 2.1, cleaned up and added License