re-struct files; link error not fix;