Cleanup
Clean up and add gradle