Rename layout type file
Move layout type names to public