reinterpretation of !119 (closed) resolves #60 (closed) resolves #61 (closed)
(also remove some deprecated files)