link generation fixed; folders cleaned up