Testing and restructure

Small update, everything should work, even if its in the wrong place