Changed folder stucture to match other projects