Standardized layout names and tried to combine.

Signed-off-by: JustinSkryz <skryz44@gmail.com>