Updated to Vane 0.6.1 and added better structure for client lib imports