Overhaul Activity.java structure