Major rewriting of basics and new structure