Added gradle support
cleanup