Moved some files around changed ioc