Adding everything back. No more R.java files!