lot of changes

* .dir suffix
* renames