Resolve some useless dependencies and move all code to src dir (from include)
Fix comments