Update folders, prefixing, conventions