- Refactoring of the code
- Added some header files for the rectangular case