Rename layout/ to layouts/ and include/ to includes/ to match assets/