syncing
restructured, added link support