Refactoring: Cleaning up the code, renaming, removing dependencies to old interval implementation. Stable{msvc-9.0, gcc-3.4.4}