Update folder structure to something that makes more sense

WIP