Rearranged files to get gradle build working