City 7 Update (Architecture + Basic content + Energy Fix)