Reworked routing and folder structire of the entire application