Refactor logic of TouchLayer to Building & UI layers