Renamed activity, integrated AndroidAnnotations