switch to express and adjust the directory struct
switch to express and adjust the directory struct