Revert "Deleted some uneeded files..."

This reverts commit c78fb0c7f483e89f27758b1691c7246809be1607.
mergeready
some conflict fixed, needed for merge