Major update: new directory structure