Models added, refactor layers