remove dashes, fix package naming
stupid copy-paste...
more layout files
renaming to provide more detail + avoid clashing