Revert "Redo file structure for gradle"

This reverts commit f50fc68ebc367d1a74f5dfde2f04883e344f65e0.