The layout should actually be very similar to the old layout, but the code will be much easier to change and should be more portable.