removed avatars; imported inc and assets