Changed folder structure to match other projects