Some changes made by moving files around