cleanup project structure
Added graddle wrapper