Re-organised folders - each folder specific VM