cleaned folder structure
Did some stuff