Moved files, did several bugfixes