Major cleanup (R.java was not working)