DCT16 - Refactor code

[lucadln]

@TODO:

• [ ] Create a class to hold all the variables that are tied to the layout;