Made folder structure consistent