Made folder structure readjustments