Update folders, naming