Moved layout XML to its own subdir again to prevent conflicts with other modules using the same name.