Realign code
Add bsp layout (unused)