Simplify project structure. Things are somewhat working.