Ui work 2

Next part of refacturing. Pages and their includes no live in their own folders