Re-build of the Bnearby prototype. Now organized!