Templates and static files re-organised