Develop

Fix PHPDocs and remove Mapper directory inside /models.