restructuring for gradle-based build and eclipse project