Restructured path structure according gradle conventions