Completely reworked application structure and routing