Really messed up the structure trying to get rid of some bad commits, this should fix that