Refactors layous/application