added butterknife library and modified java file locations