Finished the basic new layout, time to replace

Signed-off-by: Exikle <dixondcunha@gmail.com>