FICAvatar refactor. Submodule readded to project