Moved some code to layers project