folder structure + general overhaul