Reverted to 'just box' project sceleton