Add gradle support, cleanup