Moved files back to old locations. Closer to upstream.