moved dead code to attic/
cleanup and reorganization