restructuration, removal of old folders