fixed bug in Simplify for logical_or
renamed some library modules