Dir structure changes

* Wrapped rape inside own directory