Repository cleanup, other projects merged to this one