Changed some in the folder structure