Reorganise in express

Squashed commit of the following:

commit f8dd47794572040def2e65a5b2cfdc7cb47bd3af
Author: Nick Brook <nick@rmpenterprise.co.uk>
Date:   Fri Jan 18 23:08:58 2013 +0000

    Seems to be working again in proper express format

    Signed-off-by: Nick Brook <nick@rmpenterprise.co.uk>

commit 4816664d9663cf135176823c3dd6e90df02d9f9c
Author: Nick Brook <nick@rmpenterprise.co.uk>
Date:   Fri Jan 18 17:08:32 2013 +0000

    Some express stuff

    Signed-off-by: Nick Brook <nick@rmpenterprise.co.uk>

Signed-off-by: Nick Brook <nick@rmpenterprise.co.uk>