Cleaning root dir

Cleaning in preparation for real work