better folder structure, still needing to fix some stuff