Simplify resources structure and add layer everywhere