Restructed things to make it easier to navigate