Refactored code
Add support for reshaping
Move reshape to view folder