removed dependencies, removed gen-src, fixed compilation errors.