made proper folders, added controls.