Add icludes, rename files