Moved folder structure round in an attempt to get composer working