add more Proof. lines and merge logical/ and common/ directories