Simplify incomplete knowledge handling
Organize source files