Moved and regenerated R.java, seems to work better in new location