Reorganization
Added Clause thingy thing