changed setup of folders