draft 1.1

changed folder names