Rework into a proper folder structure