use gradle
tidy file structure