Refactor model for composer and PSR standards
Move view in line with new class structure
Merge branch 'refactor-fig' into dev