Moved some files, added docs
Bugfixes