Working base layout

Signed-off-by: shawnsandy <shawnsandy04@gmail.com>
Updated base layout

Signed-off-by: shawnsandy <shawnsandy04@gmail.com>