Refactoring

Moved the loading if fields into the brick to Data.php

sepparation of code