Restructured file heirachy and added the function to save the last stop opened