changed whole folder structure