proper folder structure + general overhaul