removed some deprecated files and updated some other for this to work; please note that this is work-in-progress, so current nightly builds will not work!