Move everything non-dynamic out of data folder