Restructured everything + working on stuff