Worked on the restructure a bit more