Changed folder structure slightly.