Physics layers refactor