Tape it together

Moved files, removed error code.
added indexer: moved files